Added layout and search views