Final aesthetic changes