Kal mar 18

Integrated previous changes and made some tweaks

    * new paths for callback related pages
    * fixed logo scaling on shopfront pages