#130 - UI fixes

It will fix #515 and #519