Updated UI layout a little bit