Initial homepage cleanup-- wip