lots of style changes and sass restructure