Clean code and move search box