Renamed templates throughout for clarity.
Fixed a problem with spacing on data entry page.