Huge update according to design and wireframes
Updated