Major aesthetic changes v2