Change layout improve page & add search funcationality