Removed redraw statements from Workspace, fixed redraw in controller, some minor changes