moved stuff again

moved the order of things so they don't overlap