The attached are photos of a shower floor joint where it joins the wall. It appears that the caulk is coming loose in the corners. What is the best way to remedy this problem, and to keep water from penetrating in these areas? Grout, caulk, both? Any methods or products that do better than others?