shuffled up componets but still not happy