Design update 1

I pulled your latest production to a new branch, merged my first iteration of style updates, resolved conflicts, & checked functionality.