wip on wp platform, fixing the layout.