Refined views and added links