Cleaned up the way scaling is controlled, added redraw button