Some link and view changes