rename views
simplify navigation service