Use box-sizing and eliminate calc().