hotfix layout mess up due to removal of essential border-box rule