Better separated templates to allow for consistent and easy formatting in future