Relayout to fix some scrolling problem