Revert "Fix derp"

This reverts commit 651ab6468959f8d2117eecbda6c5f2f596718ebb.
Revert "Fix Floating Window"

This reverts commit 467c724cf594e0a8b03c692a4a5e87f4c4df829f.