Tidy up the UI

Improve layout in grid mode

Add support for fit and repositioning in grid and bento modes