Revert "Mutliwindow: Follow Recent UI Changes"

This reverts commit 9ea2b7bbd46a9723b12691031df476ae69288536.