bunch of mess for new ui
.
Merge remote-tracking branch 'origin/develop' into develop