Moved controllers and directives, fixed dropdown