Box-sizing: border-box FTW!
Fixed merge?