Second Commit: CSS and template fixing. (Before class 5)