changed some ui things
Merged 'dev'.