layout refactoring and other major changes