Continuing cleanup, started mobile view revamp.