improved navigation, add forms now on separate pages