UI improvements

Raffaele Luccisano requested to merge feature-ui-fix into master Feb 26, 2020