[KFSQA-731] Refactored the e-SHOP pages a little bit to make them a little more explicit.
[KFSQA-731] Test seems to work. Preparing submitting for review.