Refactored code to keep files to a minimum, learnt some new forms and tested them on the instructions view