include all button types in search form
tidy up nav lists
nicer nav-list