Refined controls. Cleaned up code. Now using outlineView instead of tableView