Improve main page & add more info