Universal almost done. MainPage need more work