Final Clean up of existing homepage