moved some directives to controller/partial