Improve views and links