Updates based on UI designs
Updates based on UI designs cont..