Minor style improvements and fix scss attribute order errors