navigation corrected, edit subject prepared