directive/layout fixes