Small layout fixes
Fix remaining conversion problems