Some layout modifications, set up for second Graphics class