1008-1427

Some simple refactoring of some sass

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