Added links view;
fixed some issues