fixed various layoutbugs