Fix #28
UI fixes