Moved some parts and labels around