Tidy WindowManager Interface

Fixes #11