Quick secondary shop UI makeover.

Sorry for the commit attack, I couldn't fall asleep so I did a little
more. :P The second page definitely needed a cancel button. Still needs
more work yes yes muahhahahaaha.