Updated window and added setup modules