Bugfixes and changed around structure of some ui elements