fixes and back navigation