fixed margins + a few more test items