changes as per new mockups