Layout fixes

Please review and merge