2.2 release, fixed markup and UI issues