further code cleanup, removed inheritance if not needed and added some new draw stuff
Authored by: grether 2009-07-23
Parent: [r8047]
Child: [r8049]