Tidy up the UI

Improve layout in grid layout

Make it work with Bento layouts