Cleaned up css and separated into different files; also started working on search
Merge