changed the Site Controller, added in the OPtionForm again (cause we might need that) and removed some of the layouts
 added some more file