Added additional search parameters

Provide additional options to search by and refactor the general layout.