Added search bar and changed button layout