Updated UI.
Updated layouts.
Clean up.
Updated to new UI.