Do some fixes and add better view page.