Style changes, template cleanup, workflow improvement