Merge, reorganization, navigation fix