Finish up styling changes, prepare to edit sass