Initial pass at visual refactor.