DSS-262 #time 10m Resolving styling issues for the theme