Updated forms and index layout.
Updated cart page.
Fixed merge conflict.