Added border-box hack and mobile-first approach