Made second screen, cleaned up first screen