#30 Further UI improvements