#31 adjustments
#30 UI improvements