The index and about pages are near finished
Merged some stuff