Finished Layout and added templates