New Layout, Character Sets and other cleanups