Tweak search page layout and cleanup transitions code