Improve layout of search box and submit button

Towards #158.