abit more and the main page is complete