Added some ui-fixes