New layout

Various fixes and optimized layout