Started dynamic calculation, removed css classes