working toward a wms solution and making some minor style adjustments
Merge remote-tracking branch 'origin/redesign-update' into redesign-update