Fixed a few bugs and changed templates & styles