Fixed some aesthetics