diff --git a/bin/export-plural-rules b/bin/export-plural-rules
new file mode 120000
index 00000000..06abdeeb
--- /dev/null
+++ b/bin/export-plural-rules
@@ -0,0 +1 @@
+../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules
\ No newline at end of file
diff --git a/bin/markdown b/bin/markdown
new file mode 120000
index 00000000..d032611d
--- /dev/null
+++ b/bin/markdown
@@ -0,0 +1 @@
+../core/lib/composer/vendor/cebe/markdown/bin/markdown
\ No newline at end of file
diff --git a/bin/pdepend b/bin/pdepend
new file mode 120000
index 00000000..fc410e6f
--- /dev/null
+++ b/bin/pdepend
@@ -0,0 +1 @@
+../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend
\ No newline at end of file
diff --git a/bin/phpcb b/bin/phpcb
new file mode 120000
index 00000000..1843dc98
--- /dev/null
+++ b/bin/phpcb
@@ -0,0 +1 @@
+../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb
\ No newline at end of file
diff --git a/bin/phpcbf b/bin/phpcbf
new file mode 120000
index 00000000..903da4e4
--- /dev/null
+++ b/bin/phpcbf
@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf
\ No newline at end of file
diff --git a/bin/phpcpd b/bin/phpcpd
new file mode 120000
index 00000000..59658005
--- /dev/null
+++ b/bin/phpcpd
@@ -0,0 +1 @@
+../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd
\ No newline at end of file
diff --git a/bin/phpcs b/bin/phpcs
new file mode 120000
index 00000000..c438d23b
--- /dev/null
+++ b/bin/phpcs
@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcs
\ No newline at end of file
diff --git a/bin/phploc b/bin/phploc
new file mode 120000
index 00000000..85e379be
--- /dev/null
+++ b/bin/phploc
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phploc/phploc/phploc
\ No newline at end of file
diff --git a/bin/phpmd b/bin/phpmd
new file mode 120000
index 00000000..e5ec0fa8
--- /dev/null
+++ b/bin/phpmd
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd
\ No newline at end of file
diff --git a/bin/phpunit b/bin/phpunit
new file mode 120000
index 00000000..cfff7311
--- /dev/null
+++ b/bin/phpunit
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/bin/release b/bin/release
new file mode 120000
index 00000000..9a3ed388
--- /dev/null
+++ b/bin/release
@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/self-update/scripts/release
\ No newline at end of file
diff --git a/bin/robo b/bin/robo
new file mode 120000
index 00000000..be429441
--- /dev/null
+++ b/bin/robo
@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/robo/robo
\ No newline at end of file
diff --git a/build.xml b/build.xml
index c1b81222..31648f7b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="icehrm" default="build">
  <!-- By default, we assume all tools to be on the $PATH -->
- <property name="toolsdir" value="${basedir}/tools/"/>
+ <property name="toolsdir" value="${basedir}/bin/"/>
  <property name="destination" value="${basedir}/build/app"/>
  <property name="testdir" value="${basedir}/build/test"/>
  <property name="origin" value="${basedir}"/>
diff --git a/core/login.php b/core/login.php
index a5953491..54ddbe93 100644
--- a/core/login.php
+++ b/core/login.php
@@ -277,7 +277,7 @@ $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
                 <div class="col-lg-6 col-md-8 col-xs-10">
                     <div class="bg-white-2 h-100 px-11 pt-11 pb-7">
                         <div class="row d-flex justify-content-center">
-                            <img src="<?=$logoFileUrl?>"/>
+                            <img src="<?=$logoFileUrl?>" style="max-width:100%;max-height:280px;"/>
                         </div>
                         <hr/>
                         <?php if ($gsuiteEnabled) {?>
diff --git a/core/src/Classes/BaseService.php b/core/src/Classes/BaseService.php
index 3efa6338..96db6b26 100644
--- a/core/src/Classes/BaseService.php
+++ b/core/src/Classes/BaseService.php
@@ -292,8 +292,8 @@ class BaseService
 
                         $childCompaniesIds = array();
                         if (\Classes\SettingsManager::getInstance()->getSetting(
-                                'System: Child Company Structure Managers Enabled'
-                            ) == '1'
+                            'System: Child Company Structure Managers Enabled'
+                        ) == '1'
                         ) {
                             $childCompaniesResp = \Company\Common\Model\CompanyStructure::getAllChildCompanyStructures(
                                 $cempObj->department
@@ -486,8 +486,8 @@ class BaseService
 
                         $childCompaniesIds = array();
                         if (SettingsManager::getInstance()->getSetting(
-                                'System: Child Company Structure Managers Enabled'
-                            ) == '1'
+                            'System: Child Company Structure Managers Enabled'
+                        ) == '1'
                         ) {
                             $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department);
                             $childCompanies = $childCompaniesResp->getObject();
@@ -567,8 +567,8 @@ class BaseService
 
                     $childCompaniesIds = array();
                     if (SettingsManager::getInstance()->getSetting(
-                            'System: Child Company Structure Managers Enabled'
-                        ) == '1'
+                        'System: Child Company Structure Managers Enabled'
+                    ) == '1'
                     ) {
                         $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department);
                         $childCompanies = $childCompaniesResp->getObject();
@@ -1783,8 +1783,8 @@ END;
         ) {
             $departmentHeadFound = true;
         } elseif (SettingsManager::getInstance()->getSetting(
-                'System: Child Company Structure Managers Enabled'
-            ) == '1'
+            'System: Child Company Structure Managers Enabled'
+        ) == '1'
         ) {
             $companyStructure = new CompanyStructure();
             $companyStructure->Load('id = ?', array($subordinate->department));