resolving conflicts, adding formatting for the shop page to fix positioning