Fixed initial data collection bug

+ rearranged setup pages