ID Rearrangment
Added Machines Tab