Added column sorting. Need to add icons and fix javascript