Layout fixes

Please review and approve