big commit. add final touches to search and styling
fixed merge conflict