convention fixing UI issues finished
fixinf convention done
Merge branch 'conv' into dev