simplifying html by removing spacer divs, revised spacing on things