Updated UI. Removed old main class.