added sortable, code cleanup and refactor
refactor and added styling