97833c4 Fix some layout issues