Fixed the navbar, added in event windows