Little cleanup on class and move ibest to first page