Refactoring and some layout improvements