change navigation order + clean jsp view