Changes to clean code as well as match first viz layout.