#57 - Some UI fixes

- it also includes #74