Refactoring!

Morning coding!
*Reduce code complexity, make it more readable
*Add TO DO:
*Set up landscape layout