Adjusted interface between world and gui as well as HQ and map constructor