Revert de610b6..c3ae55a

This rolls back to commit de610b6c196d2d82fe5bf24324fe26874feb69d3.
Fixed some aspects for vis