Minor layout fixes and refactoring