Issue #58 and UI cleanup