Fix modal layout bug when header is empty
Fix typos
Fix some more typos