More layout refactoring and clean up done.