Fixed up layouts a little bit.
More fixes. Added drawing class!