More layout tweaks. Added some more custom river views. CSS tweaks.