[fix] new calculation rules

+ important modal window improvement