wip
New styles and migrated to sass