Started fixing spacing
Fixed JS error from merge and changed spacing