Update information and solve layout issues