Bunch o stuf
Started single page
Merge fixes