layout edits and clean up