UI tweaks
Useful for debug
Resolves #7