Fixed support for capabilitiy on tabs. Added sort order on tabs and properties