Styling touches and minor bug fix