some layout edits