Formatting
Formatting and class naming
UserInterface completed
Formatting and class naming fixes