Frontend & Calculations Update