Design edits, clean up