Refactoring and better layouting.