updates to layout and directives