Search bar moved

Moved search bar into the title bar and tidied up the grid