Updated UI

New UI and minor enhancments