Update style and bugfix navigation