Migrated budget estimator to view & minor cleanup