Code cleanup. Fixed imports. Updated UI.