Cleaned up code
Added new styling
Added animation between screens