Major update with new look and others