Potentially fixed bug
Possibly fixed error
potentially fixed css issue with view
Still trying to fix css bug
Hopefully fixed bug
Fixed bug and done styling
Merge branch 'master' into backbone