Removed unnecessary search bar - to be implemented later
Fixed merge conflicts