Improved order calculate_start_date and calculate_end_date methods. Order Scales by not_weighed in scales index