Code cleanup

Move search style change to css, misc code cleanup
Code cleanup, ensure data loads
Merge branch 'feature/code_cleanup'