fixed double highlight for database listing
fixed space between button and dropdown
Merge branch 'hot-fixes' into stable
Merge branch 'hot-fixes' into stable