UI improvements + Bugfixes