Updated UI, bug fixing.