Bootstrap search button
Bootstrap buttons
Resolve merge conflicts