Floating Windo [2/2]

Change-Id: I812e00c6b94234bb676fd05d13feb54f9ad1a40f