DAR-3115 | AdminDashboard fixes
DAR-3115 | calc mixin