Reorganising and elaborating on GUI and Page based navigation.