Improved layout of search