Handling disk node
Re-styling configuration
Adding correct sorting behaviour
Removing redundant code