Mainly fixing all original view issues. Also fixing an issue with river icons not being updated when selected.