Minor UI Issues

@shivaram1190, please review.