Fix water page navigation
Fix layout issues for water