fix home page buttons
add refs to home links
fix merge conflicts