Changes to sort and filtering
Implemented notification dot
Added comments and cleaned code