Moved the clear button, made some other layout revisions to make it work out.