Tidy up margins in snapped mode

Change-Id: If611161da01966e30bec9c7c1d9e702c7611ef42