updated all
main page almost done