Fixup screen

Change-Id: I655530c7f27f730d18e8e9d36e819e93ffd5a530