Increased buttonsize and refactoring