Fixed Issue #25 and updated UI