changes for remainig screens
merging changes from cutie and kale