bug fixes and navigation