Tidy up and renaming. Design first window.