Fixed misplaced components