Minor bugfix and first UI pass