Reworked Templates added CSS