Edits to make it one-page friendly