Fix issues not closing
Fix sort order
Fix issue with ellipses
Decease poll time