Shop Online and code improvements