More subtle changes.

Will move on to make page usable later