Completed all tabs, wireframes and flow
Conflicts resolved