Removed redundant screen
Model refactoring