Refactoring and improving layout.