re-arranged some of the sass