0930-1603

Few more SCSS clean-ups

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>