My Watershed layout and some homepage improvements