Small refactoring, evrything is now sorting as it should
Indicators in the drawer menu is now working