Compose VC - some aesthetic changes