UI element clean up

Fixes #7