Added some fixes
Added links to first page