Fixed minor issues in views