Refactored UI into new class

Forgot to include new UI class