Revise layout, revise submit button to add to card & go back button