Some layout fixes and glyiph fix