Let's take jack's changes and put them into the master

Jack made some visual design changes.  I think they should be the new norm.  Let's merge them!