move around sass classes, misc. fixes