[1.1]

Housecleaning and made the UI a bit better.