diff --git a/src/controls/ListItemTemplate.qml b/src/controls/ListItemTemplate.qml
index 68814ed..84ea9d3 100644
--- a/src/controls/ListItemTemplate.qml
+++ b/src/controls/ListItemTemplate.qml
@@ -1,216 +1,215 @@
 /*
  *   Copyright 2018 Camilo Higuita <milo.h@aol.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.9
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.3
 import QtGraphicalEffects 1.0
 
 import org.kde.kirigami 2.7 as Kirigami
 import org.kde.mauikit 1.0 as Maui
 
 Item
 {
     id: control
 
     property alias label1 : _label1
     property alias label2 : _label2
     property alias label3 : _label3
     property alias label4 : _label4
     property alias iconItem : _iconLoader.item
     property alias iconVisible : _iconContainer.visible
     property int iconSizeHint : Maui.Style.iconSizes.big
     property string imageSource
     property string iconSource
     
     property bool isCurrentItem: false
 
     Component
     {
         id: _imgComponent
 
         Item
         {
             anchors.fill: parent
             
             Image
             {
                 id: img
                 anchors.centerIn: parent
                 source: control.imageSource
                 height: Math.min(parent.height, control.iconSizeHint)
                 width: height
                 sourceSize.width: width
                 sourceSize.height: height
                 horizontalAlignment: Qt.AlignHCenter
                 verticalAlignment: Qt.AlignVCenter
                 fillMode: Image.PreserveAspectCrop
                 cache: false
                 asynchronous: true
                 smooth: !Kirigami.Settings.isMobile
 
                 layer.enabled: true
                 layer.effect: OpacityMask
                 {
                     maskSource: Item
                     {
                         width: img.width
                         height: img.height
                         Rectangle
                         {
                             anchors.centerIn: parent
                             width: img.width
                             height: img.height
                             radius: Maui.Style.radiusV
                         }
                     }
                 }
             }
 
             Loader
             {
                 anchors.centerIn: parent
                 sourceComponent: img.status === Image.Ready ? undefined : _iconComponent
             }
         }
     }
 
 
     Component
     {
         id: _iconComponent
 
         Kirigami.Icon
         {
             source: control.iconSource
             anchors.centerIn: parent
             fallback: "qrc:/assets/application-x-zerosize.svg"
             height: Math.min(parent.height, control.iconSizeHint)
             width: height
         }
     }
 
-
     RowLayout
     {
         id: _layout
         anchors.fill: parent
 
         spacing: Maui.Style.space.small
 
         Item
         {
             id: _iconContainer
             visible: (control.width > Kirigami.Units.gridUnit * 10)
             Layout.preferredWidth: Math.max(control.height, control.iconSizeHint)
             Layout.fillHeight: true
 
             Loader
             {
                 id: _iconLoader
                 height: control.iconSizeHint
                 width: control.iconSizeHint
                 anchors.centerIn: parent
                 sourceComponent: _iconContainer.visible ? (control.imageSource ? _imgComponent : (control.iconSource ?  _iconComponent : null) ): null
             }
         }
 
 
         ColumnLayout
         {
             Layout.fillHeight: visible
             Layout.fillWidth: visible
             Layout.margins: Maui.Style.space.small
             Layout.leftMargin: _iconLoader.visible ? 0 :  Maui.Style.space.small
             spacing: 0
 
             Label
             {
                 id: _label1
                 visible: text.length
                 Layout.fillWidth: visible
                 Layout.fillHeight: visible
                 verticalAlignment: _label2.visible ? Qt.AlignBottom :  Qt.AlignVCenter
 
                 elide: Text.ElideMiddle
                 wrapMode: Text.NoWrap
                 color: control.Kirigami.Theme.textColor
                 font.weight: Font.Normal
                 font.pointSize: Maui.Style.fontSizes.default
             }
 
             Label
             {
                 id: _label2
                 visible: text.length
                 Layout.fillWidth: visible
                 Layout.fillHeight: visible
                 font.weight: Font.Normal
                 font.pointSize: Maui.Style.fontSizes.medium
                 wrapMode: Text.NoWrap
                 verticalAlignment: _label1.visible ? Qt.AlignTop : Qt.AlignVCenter
                 elide: Text.ElideRight
                 color: control.Kirigami.Theme.textColor
                 opacity: control.isCurrentItem || hovered ? 0.8 : 0.6
             }
         }
 
         ColumnLayout
         {
             visible: control.width >  Kirigami.Units.gridUnit * 15
             Layout.fillHeight: visible
             Layout.fillWidth: visible
             Layout.margins: Maui.Style.space.small
             spacing: 0
 
             Label
             {
                 id: _label3
                 visible: text.length > 0
                 Layout.fillHeight: visible
                 Layout.fillWidth: visible
                 Layout.alignment: Qt.AlignRight
                 horizontalAlignment: Qt.AlignRight
                 font.pointSize: Maui.Style.fontSizes.small
                 font.weight: Font.Light
                 wrapMode: Text.WrapAnywhere
                 elide: Text.ElideMiddle
                 color: control.Kirigami.Theme.textColor
                 opacity: control.isCurrentItem || hovered ? 0.8 : 0.6
 			}
 
             Label
             {
                 id: _label4
                 visible: text.length > 0
                 Layout.fillHeight: visible
                 Layout.fillWidth: visible
                 Layout.alignment: Qt.AlignRight
                 horizontalAlignment: Qt.AlignRight
                 font.pointSize: Maui.Style.fontSizes.small
                 font.weight: Font.Light
                 wrapMode: Text.WrapAnywhere
                 elide: Text.ElideMiddle
                 color: control.Kirigami.Theme.textColor
                 opacity: control.isCurrentItem || hovered ? 0.8 : 0.6
 			}
         }
     }
 
 }
diff --git a/src/utils/accounts/accountsdb.cpp b/src/utils/accounts/accountsdb.cpp
index 5587256..c7915d0 100644
--- a/src/utils/accounts/accountsdb.cpp
+++ b/src/utils/accounts/accountsdb.cpp
@@ -1,237 +1,236 @@
 #include "accountsdb.h"
 #include "utils.h"
 
 #include <QUuid>
 
 #ifdef Q_OS_ANDROID
 #include "mauiandroid.h"
 #endif
 
 const QString FMPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)+"/maui/";
 const QString DBName = "accounts.db";
 
 AccountsDB::AccountsDB(QObject *parent) : QObject(parent)
 {
     //get permissions to read and write
 #ifdef Q_OS_ANDROID
     MAUIAndroid::checkRunTimePermissions();
 #endif
 
     qDebug()<< "TRY TO CREATE ACCOUNTS DB";
     QDir collectionDBPath_dir(FMPath);
     if (!collectionDBPath_dir.exists())
         collectionDBPath_dir.mkpath(".");
 
     this->name = QUuid::createUuid().toString();
     if(!UTIL::fileExists(FMPath + DBName))
     {
         this->openDB(this->name);
         this->prepareCollectionDB();
     }else this->openDB(this->name);
 }
 
 AccountsDB::~AccountsDB()
 {
     this->m_db.close();
 }
 
 void AccountsDB::openDB(const QString &name)
 {
     if(!QSqlDatabase::contains(name))
     {
         this->m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), name);
         this->m_db.setDatabaseName(FMPath + DBName);
     }
 
     if (!this->m_db.isOpen())
     {
         if(!this->m_db.open())
             qDebug()<<"ERROR OPENING DB"<<this->m_db.lastError().text()<<m_db.connectionName();
     }
     auto query = this->getQuery("PRAGMA synchronous=OFF");
     query.exec();
 }
 
 void AccountsDB::prepareCollectionDB() const
 {
     QSqlQuery query(this->m_db);
 
     QFile file(":/accounts/script.sql");
 
-	qDebug()<< "PRERARING COLLECTION";
     if (!file.exists())
     {
         QString log = QStringLiteral("Fatal error on build database. The file '");
         log.append(file.fileName() + QStringLiteral("' for database and tables creation query cannot be not found!"));
         qDebug()<<log;
         return;
     }
 
     if (!file.open(QIODevice::ReadOnly))
     {
         qDebug()<<QStringLiteral("Fatal error on try to create database! The file with sql queries for database creation cannot be opened!");
         return;
     }
 
     bool hasText;
     QString line;
     QByteArray readLine;
     QString cleanedLine;
     QStringList strings;
 
     while (!file.atEnd())
     {
         hasText     = false;
         line        = "";
         readLine    = "";
         cleanedLine = "";
         strings.clear();
         while (!hasText)
         {
             readLine    = file.readLine();
             cleanedLine = readLine.trimmed();
             strings     = cleanedLine.split("--");
             cleanedLine = strings.at(0);
             if (!cleanedLine.startsWith("--") && !cleanedLine.startsWith("DROP") && !cleanedLine.isEmpty())
                 line += cleanedLine;
             if (cleanedLine.endsWith(";"))
                 break;
             if (cleanedLine.startsWith("COMMIT"))
                 hasText = true;
         }
         if (!line.isEmpty())
         {
             if (!query.exec(line))
             {
                 qDebug()<<"exec failed"<<query.lastQuery()<<query.lastError();
             }
 
         } else qDebug()<<"exec wrong"<<query.lastError();
     }
     file.close();
 }
 
 bool AccountsDB::checkExistance(const QString &tableName, const QString &searchId, const QString &search)
 {
     auto queryStr = QString("SELECT %1 FROM %2 WHERE %3 = \"%4\"").arg(searchId, tableName, searchId, search);
     auto query = this->getQuery(queryStr);
 
     if (query.exec())
     {
         if (query.next()) return true;
     }else qDebug()<<query.lastError().text();
 
     return false;
 }
 
 bool AccountsDB::checkExistance(const QString &queryStr)
 {
     auto query = this->getQuery(queryStr);
 
     if (query.exec())
     {
         if (query.next()) return true;
     }else qDebug()<<query.lastError().text();
 
     return false;
 }
 
 QSqlQuery AccountsDB::getQuery(const QString &queryTxt)
 {
     QSqlQuery query(queryTxt, this->m_db);
     return query;
 }
 
 bool AccountsDB::insert(const QString &tableName, const QVariantMap &insertData)
 {
     if (tableName.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on insert! The table name is empty!");
         return false;
 
     } else if (insertData.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on insert! The insertData is empty!");
         return false;
     }
 
     QStringList strValues;
     QStringList fields = insertData.keys();
     QVariantList values = insertData.values();
     int totalFields = fields.size();
     for (int i = 0; i < totalFields; ++i)
         strValues.append("?");
 
     QString sqlQueryString = "INSERT INTO " + tableName + " (" + QString(fields.join(",")) + ") VALUES(" + QString(strValues.join(",")) + ")";
     QSqlQuery query(this->m_db);
     query.prepare(sqlQueryString);
 
     int k = 0;
     foreach (const QVariant &value, values)
         query.bindValue(k++, value);
 
     return query.exec();
 }
 
 bool AccountsDB::update(const QString &tableName, const FMH::MODEL &updateData, const QVariantMap &where)
 {
     if (tableName.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on insert! The table name is empty!");
         return false;
     } else if (updateData.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on insert! The insertData is empty!");
         return false;
     }
 
     QStringList set;
     for (auto key : updateData.keys())
         set.append(FMH::MODEL_NAME[key]+" = '"+updateData[key]+"'");
 
     QStringList condition;
     for (auto key : where.keys())
         condition.append(key+" = '"+where[key].toString()+"'");
 
     QString sqlQueryString = "UPDATE " + tableName + " SET " + QString(set.join(",")) + " WHERE " + QString(condition.join(",")) ;
     auto query = this->getQuery(sqlQueryString);
     qDebug()<<sqlQueryString;
     return query.exec();
 }
 
 bool AccountsDB::update(const QString &table, const QString &column, const QVariant &newValue, const QVariant &op, const QString &id)
 {
     auto queryStr = QString("UPDATE %1 SET %2 = \"%3\" WHERE %4 = \"%5\"").arg(table, column, newValue.toString().replace("\"","\"\""), op.toString(), id);
     auto query = this->getQuery(queryStr);
     return query.exec();
 }
 
 bool AccountsDB::remove(const QString &tableName, const FMH::MODEL &removeData)
 {
     if (tableName.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on removing! The table name is empty!");
         return false;
 
     } else if (removeData.isEmpty())
     {
         qDebug()<<QStringLiteral("Fatal error on insert! The removeData is empty!");
         return false;
     }
 
     QString strValues;
     auto i = 0;
     for (auto key : removeData.keys())
     {
         strValues.append(QString("%1 = \"%2\"").arg(FMH::MODEL_NAME[key], removeData[key]));
         i++;
 
         if(removeData.keys().size() > 1 && i<removeData.keys().size())
             strValues.append(" AND ");
     }
 
     QString sqlQueryString = "DELETE FROM " + tableName + " WHERE " + strValues;
     qDebug()<< sqlQueryString;
 
     return this->getQuery(sqlQueryString).exec();
 }