Re-Organized Sass and updated CSS