Fix layout and styles