cleaned up ANTP widget, more code cleanup