Fixed main page and added results page