Add clear button; restyle layout