header('X-Frame-Options: Sameorigin');
                header('X-XSS-Protection: 1; mode=block');
                header('X-Content-Type-Options: nosniff');

Thanks to Lukas Reschke for reporting this issue (and many more).

Name conflict with two FileUploads :-P

Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways

This reverts commit 30d31fec.