Move max daily and banked cals to settings, update table display