two more directives, cleaned up markup