add box-contents and fix layout