UI layout and bookmarks hotfixies