Layout

Enhance layout, fix issues with column layout (still needs work!)