New navigation module + moved server menu into module