fixing some bugs, added view link