layout
add search bar and viewing layout
fix conflict