Updated UI
Bug fixes