Updated scss skeleton
Cleaned up search, removed mockups
Merge