fixed wrong placement of classes