updated navigation bar
many bugfixes