Some small fixes in views