navigation issues fixed, popup structure done