Templates completed, and general css fixes