More visual updates. Not complete.