updated cart in welcome layout, updated login page