Minnor adjustments
More styling changes