Improved UI

Resolves #120