Reverting back to using content box and calc