big changes

merge boditrak and graphic interface