Some refactoring and screen autoload