Issue #41 #95 updated UI