fixed navigation border, added events