Fixing top nav buttons issue