Extensive updates and redesign