Styling tweaks
Bug fix