Changed some aesthetics