Cleaned up code, closed #33 and closed #31

Intro Screen looks good; this is good enough GUI organization for now.