various updates, moved to scss