Moved search functions to the command buttons widget. Better use of whitespace