refactoring sass, updated content, fixed some issues left and right, oh and new type