Fixes in exanded desktop

Change-Id: I8b370992e4f1d31888135d98bb1acedcec048c64