DSS-262 #time 15m Resolving styling issues