Reworked Layout and Template structure