improvements and fixes

lib/ui/common_appbar.dart

@@ -319,7 +319,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
                               icon: SvgPicture.asset("assets/icons/fa_key.svg", height: 25, width: 30, color: ColorConsts.textGrey1),
                               itemBuilder: (_) => <PopupMenuItem<int>>[
                                     PopupMenuItem(
-                                      value: 1,
+                                      value: 0,
                                       padding: EdgeInsets.fromLTRB(0, 0, 0, 0),
                                       height: 24,
                                       child: Center(

lib/ui/screens/tangheem_detail_screen.dart

@@ -267,13 +267,14 @@ class _TangheemDetailScreenState extends State<TangheemDetailScreen> {
                                   itemCount: ayatTangheemTypeMappedDataList.length > 5 ? 5 : ayatTangheemTypeMappedDataList.length,
                                   itemBuilder: (context, index) {
                                     final _ayatTangheemTypeMappedData = ayatTangheemTypeMappedDataList[index];
-
+                                    _ayatTangheemTypeMappedData.property?.sort((a, b) => a.orderNo.compareTo(b.orderNo));
                                     List<TangheemProperty> _tangheemInsideTableList = [];
                                     List<TangheemProperty> _tangheemAboveTableList = [];
                                     List<TangheemProperty> _tangheemBelowTableList = [];
                                     List<String> _tangheemWords = [];
-                                    List<TangheemProperty> _tempPropertyList = <TangheemProperty>[] + _ayatTangheemTypeMappedData?.property ?? <TangheemProperty>[];
 
+                                    List<TangheemProperty> _tempPropertyList = [];
+                                    _tempPropertyList.addAll(_ayatTangheemTypeMappedData?.property ?? <TangheemProperty>[]);
                                     int firstIndex = _tempPropertyList.indexWhere((element) => element.isInsideTable);
 
                                     if (firstIndex >= 0) {