new navigation + some GUI changes