Adding some basic window management