fixed all layout issues