Fixed various views, and links