Updated UI

Major UI change