adding customer id to user form and some navigation clean up