merged mainactivity and added search bar