Fix some container/window changes.
Merge pull request #72 from greboid/framemanagers

Fix some container/window changes.