Move marketplace preference partials  to the course preference pages; tidy up code