navigation issues and file cleanup