Scaling Changes

Calendar still wonky though