Resizable MainView cells to fit content
Slight refactoring
Merge branch 'fb-resize-main-view-cell' into dev