Integration of effective calculation + fixing minor ui integration issues.