misc work on layouts, clean up