Added Sorting to the UI
Cleaned Up The Main Model File