A better place for the search icon

Search was hard to find. Now, the magnifying glass
is to the right of the search term so it's hard to miss.
Also did a bit of cleanup