Add box sizing to make your life easier.

This will help you a lot with border, padding, margins etc.