Bug fix in view page