Set correct keywords value when upgrading. Move and resize elements.