Added navigation for windows