modify screens

Change-Id: Id407498d9e706739de8e9f85e6e6aa1fd3bafd18