More styling and minor issues