more layout edits