Issue #10 Finish UI