Improve form navigation delegate