layout work, post file cleanup