Converted to sass syntax, removed unwanted articles, cleaned up markup, added components