move stuff to layout