Made several UI improvements

Fixes #108