Fixed all known layout issues