Latest UI

Fixes #16, #18