Tidy up and added angular filter/sort; started value converters