Some tweeks to directive names and some styling