readded nav and fixed equip screen