Cleaning up templates
Updating fixtures data
Using bootstrap for styling