some aesthetics changes