Refactoring and changed controls