Refactor; edits/improvements; move stuff into main.scss.