Fixed various aesthetic problems