Cleaned up window construction a little to make openable windows work better