Fixed up some aesthetics...