Issue #82: Added functionality on the UI layer