layout and search changes