Move weight setting into directive
Move liquid unit into directive
Default to water view, show intro screen on first load