Events update, working on nav