Forms fixes, using graphics and charts