Refactored the UI into its own seperate class... and removed labels