Fix name reference and use some CSS from Day One