Merged controllers and fixed dub routes