Close to finished

Final XML Changes, Better generation of forms