CL-32 Accommodate the top menu bar to current app logic
CL-34 Change default production database vendor to PostgreSQL