Added simplified window navigation