Formatting some pages, added associations to models