#163 Fixed remaining styling