cleanup and navigation fixes