layout done, clean up now