order playlist option + some clean up

* Added "Order" playlist option
* Cleaned up some code