Load of fixes, Fields & Group Way better

TODO : 
Submit data