fix bug if there is no variant style
Merge branch 'dashboard' into staging