Fixed #22 + UI improvements