Slight GUI change

Limited success in providing toggle buttons which will make usage on
touch screens easier.
Change of mind about the way searches are handled.