More bugfixes to navbar and main fan