Change overall look and feel of stage 2. Not finished yet.
Merge branch 'change-look-and-feel-of-step-2'