major visual changes, tidying ugly stuff