Try to fix the layout issue (#474)