added widgets, cleaned up