moved some  more directives to controller/partial