Some general aesthetic changes