UI backup final

start to regroup the code