Build 0021

Minor bugfixes and UI improvements