Re-factored Templates to Include Proper Base and Blocks