Added GraphView support, fixed button graphics