Small changes to search form + cleaning up

Moved search button to the top & made the "more" button bigger and more visible.