More view and layout refactoring