Improve views slightly