Final structure is in place, now, we plug things back together
Some work on side menue