adjust rails and angular routing

merge updates of rails and angular routing