Minor UI improvements, couple of bugfixes