Made some markup and layout changes for #27