changed structure. Started working on setup page