refactor a few misplace components