More refactoring to edittext, shell controller etc.