Refactoring + added a home screen
Refactoring + added a home screen