reorganize, add skeleton view