some UX love by moving buttons into ordered list