Fix #115 Client Navigation Bar. Not present with Import Tab.
Removing whitespaces
Merge branch 'issue/115h' into release/3.1