Layout fixes

new layout