cleanup
re-add layout