got stuck and didnt really fix much but minor navigation bugs