fixed some views, and added links