renamed controller and action
added returning javascript