Beta release - added leave categorization and fixed leave sorting