bug fixes
bootsrap changes
reorder page fix