wip fix the views using newlayout and some server side code