Updated UI for issue #6