Updated UI. References #14