Tidy up UI for checkaccount and search