change layout and add search function