Better templates and layout