Adding Entry and modifying template stuff