Fixed sorting bug, fully functional, aesthetic change. [TODO : dynamic input checking]